Fix vendored qmsetup bootstrap with non-default install libdirs#223
Merged
SineStriker merged 1 commit intostdware:mainfrom Mar 31, 2026
Merged
Fix vendored qmsetup bootstrap with non-default install libdirs#223SineStriker merged 1 commit intostdware:mainfrom
SineStriker merged 1 commit intostdware:mainfrom
Conversation
5 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This fixes vendored
qmsetupbootstrap whenCMAKE_INSTALL_LIBDIRis overridden.Right now
qwindowkituses the parent project'sCMAKE_INSTALL_LIBDIRto decide whereqmsetupConfig.cmakeshould be, but the nestedqmsetupbootstrap build still installs its package config underlib/cmake/qmsetup. WhenCMAKE_INSTALL_LIBDIRis notlib, those paths no longer match, andfind_package(qmsetup)fails during configure.Flatpak app builds encounter this problem because
flatpak-builderdefaults the module libdir to/app/lib.This change fixes that by making the vendored bootstrap explicitly use
lib/cmake/qmsetup.